From: Timo Röhling Date: Tue, 25 Jan 2022 20:52:12 +0000 (+0100) Subject: Make ibl_lite a shared library X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~84 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=9158f10d347899f668100ade8868a9ac702d3df3;p=filament.git Make ibl_lite a shared library --- diff --git a/debian/patches/0009-Fix-library-export-for-Debian.patch b/debian/patches/0009-Fix-library-export-for-Debian.patch index 593af7d..bff21de 100644 --- a/debian/patches/0009-Fix-library-export-for-Debian.patch +++ b/debian/patches/0009-Fix-library-export-for-Debian.patch @@ -1,5 +1,5 @@ From: =?utf-8?q?Timo_R=C3=B6hling?= -Date: Sat, 23 Oct 2021 19:38:20 +0200 +Date: Tue, 25 Jan 2022 22:04:07 +0100 Subject: Fix library export for Debian --- @@ -837,7 +837,7 @@ index b759b0b..1f6ed14 100644 install(TARGETS gltfio_core gltfio_resources gltfio_resources_lite ARCHIVE DESTINATION lib/${DIST_DIR}) diff --git a/libs/ibl/CMakeLists.txt b/libs/ibl/CMakeLists.txt -index 0719871..8c63f07 100644 +index 0719871..5faa579 100644 --- a/libs/ibl/CMakeLists.txt +++ b/libs/ibl/CMakeLists.txt @@ -31,32 +31,49 @@ set(SRCS @@ -867,7 +867,7 @@ index 0719871..8c63f07 100644 -target_compile_definitions(${TARGET}-lite PUBLIC -DFILAMENT_IBL_LITE=1) -target_include_directories(${TARGET}-lite PUBLIC ${PUBLIC_HDR_DIR}) -target_link_libraries(${TARGET}-lite math utils) -+add_library(${TARGET}_lite ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS}) ++add_library(${TARGET}_lite SHARED ${PUBLIC_HDRS} ${PRIVATE_HDRS} ${SRCS}) +target_compile_definitions(${TARGET}_lite PUBLIC -DFILAMENT_IBL_LITE=1) +target_compile_features(${TARGET}_lite PUBLIC cxx_std_17) +target_include_directories(${TARGET}_lite PUBLIC @@ -902,7 +902,7 @@ index 0719871..8c63f07 100644 -install(TARGETS ${TARGET} ARCHIVE DESTINATION lib/${DIST_DIR}) -install(TARGETS ${TARGET}-lite ARCHIVE DESTINATION lib/${DIST_DIR}) -install(DIRECTORY ${PUBLIC_HDR_DIR}/ibl DESTINATION include) -+install(TARGETS ${TARGET} ${TARGET}_lite DESTINATION ${FILAMENT_LIBDIR}) ++install(TARGETS ${TARGET} ${TARGET}_lite DESTINATION ${FILAMENT_LIBDIR} EXPORT filamentTargets) +install(DIRECTORY ${PUBLIC_HDR_DIR}/ibl DESTINATION ${FILAMENT_INCLUDEDIR}) diff --git a/libs/iblprefilter/CMakeLists.txt b/libs/iblprefilter/CMakeLists.txt index 6bf2237..b78b8c9 100644